diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index c1b4e94..02efa1c 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -1185,6 +1185,29 @@
 		Defines divider of platform clock(clock input to
 		eLBC controller).
 
+config SYS_MPC85XX_NO_RESETVEC
+	bool "Discard resetvec section and move bootpg section up"
+	depends on MPC85xx
+	help
+	  If this variable is specified, the section .resetvec is not kept and
+	  the section .bootpg is placed in the previous 4k of the .text section.
+
+config SPL_SYS_MPC85XX_NO_RESETVEC
+	bool "Discard resetvec section and move bootpg section up, in SPL"
+	depends on MPC85xx && SPL
+	help
+	  If this variable is specified, the section .resetvec is not kept and
+	  the section .bootpg is placed in the previous 4k of the .text section,
+	  of the SPL portion of the binary.
+
+config TPL_SYS_MPC85XX_NO_RESETVEC
+	bool "Discard resetvec section and move bootpg section up, in TPL"
+	depends on MPC85xx && TPL
+	help
+	  If this variable is specified, the section .resetvec is not kept and
+	  the section .bootpg is placed in the previous 4k of the .text section,
+	  of the SPL portion of the binary.
+
 config FSL_VIA
 	bool
 
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
index b8e0888..62c3c51 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
@@ -15,7 +15,7 @@
 	. = IMAGE_TEXT_BASE;
 	.text : {
 /* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */
-#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
+#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
 		KEEP(*(.bootpg))
 #endif
 		*(.text*)
@@ -66,7 +66,7 @@
 #endif
 
 /* For nor and nand is needed the SPL with section .resetvec */
-#ifndef CONFIG_SYS_MPC85XX_NO_RESETVEC
+#if !CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
 #if defined(CONFIG_FSL_IFC) /* Restrict bootpg at 4K boundry for IFC */
 #ifndef BOOT_PAGE_OFFSET
 #define BOOT_PAGE_OFFSET 0x1000
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 4e137e0..8fba712 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -19,7 +19,7 @@
   /* Read-only sections, merged into text segment: */
   .text      :
   {
-#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
+#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
     KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
 #endif
     *(.text*)
@@ -74,7 +74,7 @@
   __init_end = .;
   _end = .;
 
-#ifndef CONFIG_SYS_MPC85XX_NO_RESETVEC
+#if !CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
     arch/powerpc/cpu/mpc85xx/start.o	(.bootpg)